Merge eca10cedb0e56aa05977dd5e282a5acdedb268a1 on remote branch

Change-Id: Iedff38f0cb546e74a6013327c99ad021fe48ab02