Merge a1163e2a3aa35f2310979b756b2b14219e67d745 on remote branch

Change-Id: I162eff628920abdec09ae5ec176e60061524d5e5