Merge "Fix broken gradient truncation" into pi-car-dev
am: d71eb2e193

Change-Id: Ie52a246e82aab04934536f9e95a20faf84cadd67