Merge 879cf3efd9744160664bd3508c127d49a5c09ec0 on remote branch

Change-Id: I9ddd928444a343b2b66081217e858881472302f8