Merge 28910a770e194d34581126397f06d378deb724f0 on remote branch

Change-Id: Ib28990384a6494e8b6cb7139a0dfd1558c4f274d