am 71e096c8: Merge "Increase buffer size, use bounds checking functions"

* commit '71e096c894b2b49b0ae63a852c0a8a5a6de0c8a7':
  Increase buffer size, use bounds checking functions