Merge 49a21bf04e2104dba493486dd67e6e7dc54b1082 on remote branch

Change-Id: I7221efb0708afa1642bdd5514c977535b95a5bac