Merge "Fix IllegalArgumentException in KeyChain" am: 932f96b27f
am: e73f8e8827

Change-Id: I3b779c5456525d4980284baa532eafb415695b47