Merge "fix data encryption fail when ENCRYPTION_FLAG_NO_UI is set"