Merge 4629b4eadcfd2994d566a3999f275a38365431a8 on remote branch

Change-Id: I89c10c355224adf94335d5739a1726ad6f958a0c