synced to Perforce Change 543446