Merge 8fc79d7402082e2d1746d2e0b6565b4ea5457b88 on remote branch

Change-Id: Ic710fdbcdf2a11d1fe35267046a12d3d10810ff1