synced to Perforce Change 544036