Merge "Merge "Avoid NPE on certificates that cannot be read" into nyc-mr1-dev...
Merge "Merge "Avoid NPE on certificates that cannot be read" into nyc-mr1-dev am: ae76b4ea am: 9165701d" into nyc-mr1-dev-plus-aosp
am: 2ae9e260
Change-Id: I98901287d4a64f6f76460031dec3771d612d422f