Merge 9a987d3a62489183ee993789771c77ec9ef00241 on remote branch

Change-Id: I252feb9f7d60762a82f1c6a95bb052cb26032a5c