Merge "Revert "Fix for uiautomator arguments that contain spaces"" into jb-mr2-dev