Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev