Merge 793549eea5e6c876695638743a79b2047ac9fd6f on remote branch

Change-Id: Ibd5663340f12563c7876c7b57b6ca40a4df8fa04