Merge "Notification method renaming." into oc-dev
am: ee1bb6013a

Change-Id: I0246fff48b3924cf02ff24ed2b47870d5536e5fc