Merge 1c7bd6f168073b0a10f97e87703ef3c529065a56 on remote branch

Change-Id: I747d35827fec90ddbe5ec21278112698e210ed39