Merge "Add cases for types to query args." into arc-apps
am: 121579a2a5

Change-Id: Id364f081717196b663048ad318a2de37f4d03060