Merge 44bfcdf93c0e79cf15fb56cb32e92bc065eb4015 on remote branch

Change-Id: Ia7be7814852484523f53b482b0a4e4eedf2e3cc0