Merge "Adjust Notification APIs per API council" into nyc-dev