Merge "enable instrumentation mode to run UI Automator tests"