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

Change-Id: Id6327d5242e570db91399978c983d6377f709ebd