Merge "Enable the switch in TrustedCredentialsSettings"