Merge 58a0cb281f13cd0040a032b208173a515f1ee35a on remote branch

Change-Id: Ia261f6ef888ecf205b7e6f70a95fc1308c9d154d