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

* commit '8a83ce9cf5487921596161c31714ae1a5e8db6b7':
  Check vector size before accessing