synced to Perforce Change 547972