Merge "standardize account manager notification IDs" into oc-dev