Merge 106eeb00a837d83431079c2f4559a8693a84649f on remote branch

Change-Id: Ifc58890d786b2dac30d89ec58582a7047769d3bb