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

* commit '9f7fa4c4177c405566445760ec7f4c27e812cd7f':
  DO NOT MERGE - Fix readback lengths