Merge fb58894c06a707500a73fee53de1314cc2c6094a on remote branch

Change-Id: Iedecb0368ed3dfdcbfdb28908adc6ec0dd99b73e