Merge 582563eb88c5f11b7295156d45d42d9887aaeb9c on remote branch

Change-Id: Ic766649cbeec30e4f5320a03ec865054f5464bb2