Merge "FP2-1575: Track usage of Vector / SortedVector from libutils" into fp2-dev-v2