Merge 478d48f33581f55b5689be5e392b252cca554c6b on remote branch

Change-Id: I2236fb44f31d07d32c52b8cb4a28cf0c732891e0