am 34fcaf46: am 42cbb781: Merge "Modify unit tests to run on-device as well as on the dev machine."

* commit '34fcaf469509b40810d0393f7f3112f1a0a692e5':
  Modify unit tests to run on-device as well as on the dev machine.