Merge "Add PackageManagerLocal for mainline modules" into tm-dev