Merge 4d24a94de261abb0fbabfd4fe87482e013d193d7 on remote branch

Change-Id: I8ee7772b86dedeabeed42f71db1590df4216ade5