Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev
am: 30e434a996

* commit '30e434a996e0053eeeeb41f6a198f3945055445b':
  Fix memory leak via ZenModeController callbacks.

Change-Id: Id392b79729d9f8e560554859260845d3f0972548