Merge b2dfeae869f494c9c0457ad99a4886fd728a9130 on remote branch

Change-Id: I30c33a94a1dccacbabfadddcdac8b57a5d274eb8