Merge changes from topic "default_psi_kill_mode"
am: c67350bc68

Change-Id: I1b3f86193a7c2a47829e9fd8403e3b130b79c5fb