Merge "Updating the UiAutomator due to framework API change."