am 91abac4a: am f09d59b9: Merge "Check vector size before accessing" into mnc-dev

* commit '91abac4aa5527becb46c4c6a16d613f39194d00c':
  Check vector size before accessing