am 37bbdaf0: am f6136806: Merge "Improve AlarmActivity logging" into lmp-dev

* commit '37bbdaf0487ae04118db0573b8cca2d3374ad647':
  Improve AlarmActivity logging