Merge "Add EXTRA_PROVISIONING_ALLOW_OFFLINE"