Merge "Limit cert file reading to 10MiB."
am: ae1a16bd41

Change-Id: I07ce597fe3b9be513668ed28755e859471c71fc8