Merge "Update DeviceProfileDumpTest to work with flag on and off." into main