Merge changes from topic "default_psi_kill_mode" am: c67350bc68
am: 8c1d025db4

Change-Id: I018c3fa214201b7a98b4865b6c38737f9730bbc5