Merge d63da3e060ec549dc7a0e211e0ddb793f1d02fa8 on remote branch

Change-Id: Id72c49fd1ecf2328941744a1de28fcfc8402d7e2