Merge "add new test class for JUnit tests on device. Bug: 8538755 Change-Id: If5f5accdc82cf092add7edd27eb36512b39f5734"