synced to Perforce Change 548202