Merge "Initialize Hipri correctly." into ics-mr0