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

* commit '5e362c871a7b79b12e91a8737606988163f84dcf':
  Increase buffer size, use bounds checking functions