Merge "Pull Keystore2CrashStats Atom." into sc-dev