Merge "Keystore and gatekeeper not working when servicemanager crashed"