Merge "Pull vma.usage.vss updates out of for-loop"