Merge "Mark more Bundles as being defusable." into nyc-dev