synced to Perforce Change 546858