am fb1ca0c7: Merge "Rename field: fd -> fd_"

* commit 'fb1ca0c703bc3514207cbf25d2860ca47ebc4755':
  Rename field: fd -> fd_