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

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