Merge 77f5e56399bc82e07feb59618b4fbfa7c49a2ea8 on remote branch

Change-Id: Ifb56b0a940032af3e3fadec2ee4b2da4eb65ad99