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

Change-Id: Iaeb60bdbf7f315e94f31497d05f88c4b1080fc5d