Merge 754c113c6361f161389a68005df3c766cd0028a7 on remote branch

Change-Id: I5c66a2d7fd859b7a3d74769fcf7e24aec200d1f4