am e18df357: am 794b587b: Merge "Fix entry handling for 0 length entries."

* commit 'e18df357a4f8e3e960cca4ae281d3fe2f3e4b2c0':
  Fix entry handling for 0 length entries.