am 98e9c747: am 8d28491a: am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev

* commit '98e9c7472ccb8f45220f73bf1c693f681681c00a':
  Remove don't kill flag from CryptKeeper to stop logspam