Merge 6ed645ba533dde0b2150992134f185983c81bd0d on remote branch

Change-Id: I0db26213c855939f41c9f95144cad052428bdd56