Merge "Query without a subid uses the default subid" am: 8af31df84b am: 2b4e5037a5
am: 34a717dc53  -s ours

Change-Id: I34cf08a1aa2cc4b598bb5a1924dff6323a85c5fa