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