Merge "Make keystore a core service"