Merge "Multi-threaded Keystore" am: 2fda3db108
am: 56b4e34887

Change-Id: I6cac964f85fc17dfa5d923b90d2dac2fe9b56610