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

Change-Id: I37b216c0657b6b339df84080cad5523307fd44ac