Merge 9a5480e9f0603d5a36e28c969d5d78c8ed29f0dd on remote branch

Change-Id: I093b21efea754f5dd3fd70c4b0334319f9076acf