Merge "DO NOT MERGE Add test to prevent touch location leakage." into nyc-dev am: cd5a182836 am: ce13f3defa am: 9f209b576a am: d15a096273 am: 9e9a1b8c46  -s ours am: 2dba6c873e
am: 379b74c3c9

Change-Id: I0b6345d04fc7b8894d81a4f81037b1bc4a0fc881