Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev