am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop...
am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
* commit '0f1e7bfe':
Revert "Remove don't kill flag from CryptKeeper to stop logspam"