Merge "Simplify KeyChain API by removing now unneeded CA certificate lookup (1 of 3)"