synced to Perforce Change 548954