am e59d0522: am 3400286c: Merge "Fix project files for DeviceConfig"

* commit 'e59d0522bc9937df9c29651a0bd9c8c1137011b2':
  Fix project files for DeviceConfig