Merge 6c195cd0a4142fa24f949c5f720c47763040db12 on remote branch

Change-Id: I6192e02e3f9a10a36c8be9ad09f0b91118e385ce