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

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

Change-Id: I7d8702f3761ed71b1c06f1eedaa5740cfc2e799e