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

Change-Id: I3c59a0417cb59917f905e3c63c97c4d41113bcf7