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

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