am f668e0ba: am f3d07927: Merge "Allow enum generated IDs to reuse existing IDs" into lmp-dev

* commit 'f668e0ba54fa836a818807ec6f76600fc97343ae':
  Allow enum generated IDs to reuse existing IDs