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

Change-Id: I33e59ffbe071470608141579d1742a414f308f76