Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into lmp-dev