Merge "KeyChain: Adopt to null return value"