Merge "Add TouchIntegrationTest tests" into rvc-dev am: f49a7c4712

Change-Id: I08b75d61b2d12df64db12aba0eb280482aa99b36