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