Merge changes from topic "default_psi_kill_mode" am: c67350bc68 am: 8c1d025db4 am: c8ad8b4a0e
am: 0dfa191e7b

Change-Id: I623717567222a48276162a0ffcfad0ed77c973ae