Merge "Multi-threaded Keystore"
am: 2fda3db108

Change-Id: Ib677de5c0f5016051e4e3c28c3a5058f2b31681b