am e13fd9aa: Merge "lsof fixes."

* commit 'e13fd9aa231b117b03be6b84b7fb0debe6cb620d':
  lsof fixes.