Merge "Not cache empty config bundle." into nyc-mr2-dev