Merge f60a9c891d1c939792d185a8c1f65133d48153fd on remote branch

Change-Id: I40e6151f414c27a28cc4166d12879234ecf261cd