Merge "standardize system notification IDs" into oc-dev
am: 441162562b

Change-Id: Idb39af001fefa77b6899c3c9d8816532b5e54dea