Merge 1560c0a52abf6cd5d881af6408b0b09f0b584191 on remote branch

Change-Id: I2949d684e62a3542cca43b15e983c7a10db29d44