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

Change-Id: I2dd321f4b961c281b4e87a8d0202e86593c0c076