Merge 1c40c1c79a92d399d0ae4444d16ec3ce32b46c5a on remote branch

Change-Id: Ic43ccd477fed21d3d70fb656d888dbfe548ad4eb