Merge "Remove sanitize:never"
am: ad4a6db68e

Change-Id: Idce6e83bd865d79bc32f3967efef4b934360b632