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

* commit 'bad8e2e37c89fa99031838f8f40f6cf52a42deb3':
  Fix memory leak via ZenModeController callbacks.

Change-Id: Iac59386fdb878007462c7a6a24770341d1db8914