Merge "Fix failure to load power HAL implementation" into oc-dev