Merge "Move mount service wrapper calls to PackageHelper"