Merge 477b96e9604a126887b43e6fb8a1157b13e72270 on remote branch

Change-Id: I7e554fdb27d57074e35113420cecb753b6c47a24