Merge 5d40649f009939a41c7b176ac04441c1a131a572 on remote branch

Change-Id: I5ba1b332bdf94407288e7f421818bf8e32f19d02