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

* commit '8026ad3838e2f7367e8ff616f66b2c2f8bc8488c':
  Check vector size before accessing