Merge d6ce8d7d692aed0c45669632709444b13a1b958d on remote branch

Change-Id: I8d6a541eaa10ea98d9996e959aef000760efdc79