Merge "KeyChain: return null instead of throw"