Merge 7932dd7b4122213dfbcc3d111a6ef27a0b5728c3 on remote branch

Change-Id: I092d1e55ad9abcd8eb7af7fe8da7f11e4ddfd0c4