Merge "Freeze first batch of HALs for O-MR1" into oc-dr1-dev