Merge "Only sanitize Android." am: a22ce825e6 am: 98536b07fc
am: 9297e0e314

Change-Id: Ibade4c5e57c3c9922d09a13a09514a56c996ecfd