Merge a46a19cda5a7cd6556b8e79ff117657b6fcb0dd0 on remote branch

Change-Id: Ifdb16747bc8a3db59d495150699b759c4e657080