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

Change-Id: Idac455a089a044ae38db4993a87034fc907d6a50