Merge "Fix TrustedCredentialsSettings NPE"