Merge "Fixing broken instrumentation tests when run from command line" into ub-launcher3-calgary
am: f305520

* commit 'f30552080842452e181113bcd333d66b56403e92':
  Fixing broken instrumentation tests when run from command line