Merge 643f6e80460f44c2b9764fae13eae80b1921635d on remote branch

Change-Id: I7bdc77bd441f3c7b08486d43eab2562cc5986f59