synced to Perforce Change 572228