Merge d742194114a1d935c30745636ddd3dcc1ee4dd99 on remote branch

Change-Id: Ia6d1664dedd328341f358c015687f68c06b4e403