Merge 9f43a624eae52bdcbf740037424ab5e07a61f869 on remote branch

Change-Id: Ic3d308e2c76494a8df59d56aafec878e2e2e2519