Merge "Crash fix by importing Config from the correct package." into nyc-andromeda-dev
am: d43524b2ad

Change-Id: I078b4daca42f0d4ceebb8d6a7704f2e9dc1b9faa