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

* commit '7c336197bd2d75b85a569a8d29b97b38dbb13b5a':
  Fix regression in ModUnionTable RAM usage

Change-Id: If256cb0d094d04c5cb0dee1e1359a49f3f431c61