Merge "Make keystore a core service" am: 04b8903804
am: 5f58b20b00

Change-Id: Ia391d55d7b2036c8af470a449636dbcfeeebc3e7