Merge "Use vector instead of deprecated ScopedVector"