Merge "Query without a subid uses the default subid"
am: 8af31df84b

Change-Id: Ibe0cd1a415a8b6d07bde7ea6eb0a14d113763566