Merge 1ba0246b6a79c1f479ea3d0a9230043f7852e30c on remote branch

Change-Id: I8fe991675778513b0b9b427c23b4a99feb9ccb5c