Merge "Load default KeyFactory instead of BC's implementation" am: 8974255bb1

Change-Id: I6b99bb60f5b2b1f85c1babdf6732c063d9e9354d