Merge "Add EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION"