am 90da8e64: Merge "Cleanup debug and WAR vector type packing." into jb-mr2-dev

* commit '90da8e64b86de90bbbd31d73b80dd6bb96828a2c':
  Cleanup debug and WAR vector type packing.