Merge "New DeviceConfig flags for NAS"