Merge "Only sanitize Android."
am: a22ce825e6

Change-Id: I54991f4989b054cbca8d3326581a6a60392ecfc4