Merge 47a31802d4041c40e796d2bba30b0dc55fcebc98 on remote branch

Change-Id: Idfeb694ca7fc8c2c0c7fbc5806f2405b374d1907