am ea3f1bf6: am a6892270: Merge "Clean up mod union table"

* commit 'ea3f1bf63d1f908417f80aedb5d0bbd7ee4cc58f':
  Clean up mod union table