Merge bb31fc6ecedbbb938b1c3e483b7f0e22dbbded4e on remote branch

Change-Id: Ideca412d21bb77601a561d8b45bc007a6b25e029