Merge "Update Multi-OffHost related API definition" am: 65af5e2470
am: def17e7592

Change-Id: I5d9c7e63a37cf13eadb0e47331a544e01b65d3be