More Touch Wake Test Stuff.

Change-Id: I2073a7c78672ef54a1913213d850ff96fdf750a5