am 56c6392f: (-s ours) am 9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths"

* commit '56c6392fefba53e72c9effb7b5c92c64e03ecfd5':
  DO NOT MERGE - Fix readback lengths