Change-Id: I166c67a7a34430627c17365f60bac75b6da1b434 (cherry picked from commit a0bde7d525911680f9e5fb0a939604865eb8e164)