Fix crash when loading roots from invalid provider am: 4a4a8c4048
am: 290d61493c

Change-Id: I8b498a204468d3724fde1826e1d2778f07d7f53f