Merge "Create a global registry for system message IDs" into nyc-mr2-dev am: 1f2769189d
am: b5571b1a18

Change-Id: I9b4b95e355640479fc114dc145bafb8316346c92