Regenerate the configuration after the upstream sync.

Change-Id: I4a26da4dd9f27de167960c9afa59753dbfac7a19
8 files changed