Merge 66150235cac369b06ab584afa9ee303471518b3e on remote branch

Change-Id: Iddbf45a12fda2868f28e35dfefc396193fe741b6