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

* commit '48347048bade66799525391ca3bcfb42f95243a7':
  Hide alarm condition if there's no alarm.

Change-Id: I5613d6377b97aa35c6427730da8df643780017f5