synced to Perforce Change 551120