Merge "Fix IllegalArgumentException in KeyChain"
am: 932f96b27f

Change-Id: I0f6d30cc3b29a1cde15b1f8179265ce97db8c553