am e55e820e: am e13fd9aa: Merge "lsof fixes."

* commit 'e55e820e663ae34091d079922f99804f1c004b80':
  lsof fixes.