Merge d57b2aea490b4394fdc28c4cfe09bf655660b8a9 on remote branch

Change-Id: I3ea3050b0f12cf8587f61683dad14d9da575195d