synced to Perforce Change 547079