Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev
am: 647166e852

Change-Id: I8985e69d3e04f0da6b923cf15db418338ac4edab