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

Change-Id: I4a848869ed69f37264867cc2d1df451be6003709