Merge 9611f32d00804168d98f11b22a480b3d04d91ea3 on remote branch

Change-Id: Ia5668888d89fa682c80d355eab32ae777e9d11ba