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

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