Merge 024a6362237593eaf4af3bac23ebd4b3320a9d5f on remote branch

Change-Id: Ic3a040322960962138cc924708bc300178716593