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

Change-Id: Ib318ce344dd20e245d9a48be541595cb9a6b0b8d