Merge "Low battery notification sound update, alarm sound update" into honeycomb