Merge "Use PackageInfoUtils with null PackageSetting to set server-only flags" into rvc-dev