Merge "Add offline-installer as an installation option"