Merge ba9d4d83266aa7008d47ef14a31480ca54b7c384 on remote branch

Change-Id: Iccb444a2ed42d6da1b5b429963227314059219dd