Merge "Use the right package name for MountServiceIdler"