Quick fix for Localizable.strings
Merge pull request #3181 from paymand/localizable_strings_fix

Quick fix for Localizable.strings
Fix uiautomator test
Merge pull request #3187 from imurchie/isaac-uiautomator-test

Fix uiautomator test
working
working