Merge e12663b3ba0f6cd6b715a784c3f2b5d12f6db668 on remote branch

Change-Id: I92ca175accba4f532cb867897f0b3235ea06ecf9