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

Change-Id: I3cbf3605b6b555748f7c401165088e6f668256e2