Merge 60eafd3d7bb9cd0951713ed6370077421f38d532 on remote branch

Change-Id: I7edcf734bd84e3daab9c3b660c613ba2882a5c3a