Merge "Fix regression in ModUnionTable RAM usage" into nyc-dev
am: 5650650

* commit '5650650dbb97460adb957a6da3f320ef9574bc6b':
  Fix regression in ModUnionTable RAM usage

Change-Id: Ibb950dc3fd4075ef5d63a45b25900f153dfc18f4