am 2bf7a17b: am 491b8f3b: Pull the change from DeskClock into AlarmClock.

Merge commit '2bf7a17be05fe433e1126da6689e3e9c1eed9e99'

* commit '2bf7a17be05fe433e1126da6689e3e9c1eed9e99':
  Pull the change from DeskClock into AlarmClock.