Merge 0ab616335b1f504b45614bfad2dcdacf5192d7c1 on remote branch

Change-Id: Id3735cbfb13ea4f62f75fdda6d1d1441d3b49581