Use new layout for alarms JSON

Change-Id: I70752a692d5bd2e82b7ddb8af8f6dc243acc37b5
Merge "Use new layout for alarms JSON"