Changes to support AlarmServiceView
Merge branch 'cindy'