Merge 934ff6b45db46925f79563dc920861e2ced8e8d2 on remote branch

Change-Id: I59535d816275bec5667749e7dd38c795ce0922ef