Merge "Make TARE DeviceConfig-urable." into tm-dev