Merge "Cleanup debug and WAR vector type packing." into jb-mr2-dev