Merge "Enable --collapse-resource-names on bundles"