PDI-9965 - hdp13 shim cleanup
PDI-9965 - further ivyization of hdp13 shim
PDI-9965 - ivyizing hdp 12 shim