Merge "Notification method renames." into oc-dev
am: d62e9610c6

Change-Id: Icc9ec0772246a6ffc15f603b7cdeda5db5f18447