Merge "Adds OFFHOST_AID_ROUTE_PWR_STATE config" into pi-dev