am 6efa86be: Merge "Check vector size before accessing" into klp-dev

* commit '6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd':
  Check vector size before accessing