Merge "Remove sanitize:never" am: ad4a6db68e
am: 29a3a9a086

Change-Id: I8df1507127399dabfa31608db12da6a5b8d7a8c5