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

* commit '62716a9197ba77b349d74770e6cd3b114e5f5de7':
  Hide alarm condition if there's no alarm.

Change-Id: I16ff49b128224db3972335fd1f4b0aee9a06fcb8