Merge "KeyChain API refinements"