Merge "Fix regression in ModUnionTable RAM usage" am: 43574b5
am: 5bc39af

* commit '5bc39afa9d22ce2c78f65ba48b07dc73c2726966':
  Fix regression in ModUnionTable RAM usage

Change-Id: I85b03cce5a929832598f949ff15b8af47e38d176