Merge "Special version for alarm manager" into alarm_wa