Merge "Add intdef for UiAutomation flags." into nyc-dev