Merge 173e79e6caef197fea7c57655dfac38fa12019de on remote branch

Change-Id: Ia2f23b98f5336169c32f66baf21b806cb1d83333