Merge "Merge "Update Multi-OffHost related API definition" am: 65af5e2470 am: def17e7592" into qt-dev-plus-aosp