Merge 4b8ebfe5d788a3c577562af916324bfbccf28419 on remote branch

Change-Id: I3b1c0ab7b3aee224f73e301b0729cf7ad0230ec8