synced to Perforce Change 548074