Set some defaults for deathly

Change-Id: I527e206c5d4f42c6c182a25145fd00359535382d
Merge "Set some defaults for deathly" into kitkat