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