Merge "Update UiAutomator Condition"