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

* commit '3400286c9a4d25ba2cbc2522ca7a74cd916c5427':
  Fix project files for DeviceConfig