Merge "Defaults update for offline: maas"