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

Change-Id: I09615782d8c709610408ac3da78385b8b134a530