Restore third_party commits overridden by 1c11654aca89c3d5262af4e34eb9b733e0ba45bd