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

Change-Id: I05b5f3fcc543ae7d6f52e34b5052a982d6726366