synced to Perforce Change 572228
fixing merging issues