Merge "Query without a subid uses the default subid" into oc-dev am: 6a8d375506
am: 1234e50433

Change-Id: I8d360711c1df20bc0ad13d9e681c2bf52b76f89a