Merge 16fbf994cbd66b7afbb2db9a610686de90622483 on remote branch

Change-Id: I1dbe847def53953526d8cdee186501c5aa9d77c5