Merge 4892ad815e1b6c866112062154802ba52177d77a on remote branch

Change-Id: I39db84548d5eea54fa111fa57d3df77a9e29ac40