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

* commit '84e725309c468b9f8d49e25562b6ee400c79992e':
  Fix memory leak via ZenModeController callbacks.

Change-Id: I865083fdfb2ddaa77d772d77770c1a48859dc03c