Merge 125cc109167d2a21644b98f6d490fb49756d9e5c on remote branch

Change-Id: I50340a1fa7efef50df552cc6d3dd3f5f1814b660