Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78
am: 2c04e72414
* commit '2c04e724148556aacbb3956b39af04a16e2a385e':
Change-Id: Ia833572871a8dcd6b89465bd7117354fa8f8f7b3
This commit is contained in: