Merge 9a849eea0d8d4a4a0f46c361166e24507c1d3a60 on remote branch

Change-Id: I39390a57cfdb973971cc041c60e4fe9f0b40f25c