Merge "Fix memory leak in keystore" am: b48208f2c9
am: 1af5c8b956

Change-Id: I452a387062e9fefea58911d12a53ee2e7315cc41