Merge "Work around "error: variable 'uio' set but not used"."