Merge "Rename DirState -> Config to avoid confusion with State." into nyc-andromeda-dev
am: d0a67727ed

Change-Id: I96ac982eea7be68cbe8e73509bd02bfc008c7e78