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

Change-Id: I56c9f432277dc1122d6fb756190c0e6337db0877