Merge "Tracking KeyChain API refinements"