Merge "[DeviceConfig] true/false should be wrapped in @code tags"