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

Change-Id: I327e931490d3d81b824b134795a57add7c257c74