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

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