Merge "Add default alarm back into AudioPackage"