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