Merge "Break key installation into its own function so we can install non-master keys."