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