Merge 58a0cb281f13cd0040a032b208173a515f1ee35a on remote branch

Change-Id: I62580851556d1aa2ead3f2a7cbbae4a69636c03b