am 723ad75e: Merge "API cleanups for Notification." into klp-dev

* commit '723ad75e107f57dc541dfca600745895e1251974':
  API cleanups for Notification.