Merge "Put VID staging back to 3.2-STAGING-latest"