Include alarms in mixnmatch.

Change-Id: I11a63b665550fc7f8f89df837ab0fc8ebcd2c8d3
Merge branch 'cm-11.0' into kk_mkt