am 833c7ee6: am a575b850: am 61af6530: Merge "Remove /dev/alarm cruft from uptime."

* commit '833c7ee68a562cae92c7f70fb572ec8747a09c00':
  Remove /dev/alarm cruft from uptime.