Merge e0739279ab75134e42ff9fdc4e3dc93b6a2d84ec on remote branch

Change-Id: I7efcf88dc403c556cdc646aaa3fba36b21ca48ae