Merge "Match the config from ubuntu"

No match.