Merge "Add cases for types to query args." into arc-apps