Merge "CDD: Require Notification management API's to match the SDK." into nyc-mr1-dev