Merge abe31817819d2bf78001da16abf524a87087df36 on remote branch

Change-Id: I10efaf14491cf530f16bd7255fdf50dbee0c1268