Merge 6e3b7ae5e677b05e114893e6bc6fbc55d3db819d on remote branch

Change-Id: Ie4ddd9b5d5d3d6a4a58d80773c00191fa4b0f431