Merge "Update Multi-OffHost related API definition" into qt-dev
am: 74c8818d79

Change-Id: I2ed2386499c64b6b486e494388585d71216591cb