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

Change-Id: I65db298669a1d7d269976c69dde16413950369c0