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

Change-Id: I76d398aede62f7303a9aa99085572d7f57a08c9b