Merge "Update assertion in testQuerySdkSandboxPackageName test" into tm-dev