97976b20bf
These files were accidentally omitted during cherry-pick workflow. They were present in 639ef12 but dropped when switching to git apply workflow.