Clean-ups related to alarm history patches

Some non-blocking clean-ups requested in reviews of the alarm
history patches.

Change-Id: If009166be450f2e1bba0e68ce74699b5a032543e
Merge "Clean-ups related to alarm history patches"