Merge "Deprecate DefaultConfig.h."