Merge "Only customize AlarmService for ARC++"