am 3dbc2fe3: Merge "Work around "error: variable \'uio\' set but not used"."

* commit '3dbc2fe33e7a1c0e545f7762d3c7a98429c5a82b':
  Work around "error: variable 'uio' set but not used".