Merge "Mark more Bundles as being defusable." into nyc-dev am: 620a28b
am: c012cf2

* commit 'c012cf26869e432adf8461e7134f117d95f239e2':
  Mark more Bundles as being defusable.