synced to Perforce Change 573629