Merge "device_supported is true by default, no need to specify it." into main