Merge "Adds logic for OFFHOST_AID_ROUTE_PWR_STATE"