am 5ff4bb7a: am 8026ad38: am 6efa86be: Merge "Check vector size before accessing" into klp-dev

* commit '5ff4bb7a65f0495c2cd79413ef3001b208ae7e2c':
  Check vector size before accessing