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

* commit 'f09d59b9c03d3ac3523517ea587e7587e669b6a4':
  Check vector size before accessing