Merge "Fix detected integer sanitization" into pi-dev
am: 3e49917579

Change-Id: I26f74bfc19e29a605de2e3227b20fee258b3b104