Merge 78d166aa1b5cc94b80a904736414e315e05f61f9 on remote branch

Change-Id: I8db4e0b5517a7a18d61fddc2a428175374a0ef60