Merge "Remove DeviceConfig dependency." into tm-qpr-dev