Merge d268fb73493040bbfc54a291c1cf5c53a21be6a3 on remote branch

Change-Id: I5f6eb4b74e28908de1268501517e3d4bb4001c7c