Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197
am: 9548013287

* commit '9548013287f8345177e106cb79bc8c6d621457bd':
  Hide alarm condition if there's no alarm.

Change-Id: Ied3c40add25a0ffa8e766a820e64498e189a7df5