Merge "Revert "Make keystore a core service""