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

Change-Id: I39a7c92892eed7ebff42873015ed8c99b97276b7