Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev