[Initial] Blunt merge 3.4 crypto headers