Merge "Power: Using only v3 powerhal version for this branch" into power.lnx.6.0