Merge "standardize account manager notification IDs" into oc-dev
am: 31a6d784d6

Change-Id: Iee5bed5eb67170a1dd231aef3fab5ee1f1491857