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

Change-Id: If2b68fc4862331f5c17a6db319cae153af03284c