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

Change-Id: If74c338bf27ed5e8f6bff9b76c99fd80370117e1