Merge "Update mock classes to reflect powerhal changes" into main