Merge 8b0868f1df77b9feba1aa8a2b24a003c919d7608 on remote branch

Change-Id: I8fa355478963954f1e93ff00985ade00a592b3e7