synced to Perforce Change 551221