Merge "Multi-threaded keystore" am: 9f248989bf
am: cbd890315e

Change-Id: Ie394840ac3e0bd571b9dfb6654c28d8a4032617f