Merge "Update Multi-OffHost related API definition"