Merge "KeyChain: Improve key override documentation."