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

Change-Id: I87310cd0239c1d343734861d3783710299d3775d