synced to Perforce Change 549771