Merge "Fix memory leak in keystore"
am: a5273d9a57

Change-Id: Iec9ed0d767cc1f3aa459583435ff1ac0725321b8