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

Change-Id: I39320f591a7e67ac7af27bc533bdddd0b728ca68