synced to Perforce Change 549538