Merge "Testing more fields in AlarmScheduled" into sc-dev