Merge "Improve robustness of package manager certificate collection." into froyo