Merge "DO NOT MERGE Add test to prevent touch location leakage." into lmp-mr1-dev am: 6871d85708 am: 20081459f4  -s ours am: a03fbd154f am: 446c80af8a am: 378d8742b2 am: 5a0c825177  -s ours am: fa8cd7bc83 am: 63e81d7187 am: 4704685af2
am: 764d15445e

Change-Id: I8001dd186ab961ca7394a49a9142cfb07402e65f