am 705a6642: Merge "Fixing alarm clock bug"

* commit '705a6642c40156648d9b426e142975cf86c93bd8':
  Fixing alarm clock bug