Merge "Adding services for alarm manager"