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

Change-Id: I295ebf45130e3c08b22af29977fee60482080947