Merge "Fix memory leak in keystore"
am: b48208f2c9

Change-Id: I6f641b6a5b34084cfe26d048a579c2f6ad9fa4fb