Merge 857e3e90c3dcd429536d740e9a6557ff72e60e47 on remote branch

Change-Id: Icb19b6035350093d2b3a54bda4bb582fd34ddb1d