Rebuild configuration after latest sync.

Change-Id: I8be56e1b83348b83da4670c1a32c1c92c0f748f2
7 files changed