Merge "Multi-threaded keystore"
am: 9f248989bf

Change-Id: I1b03fb5a0d70e518eabc363828514ed93032f3bf