Merge changes from topic 'kill_debuggerd' am: 134a7193a0 am: b1a94fb6e5
am: 2f7864a3a5

Change-Id: Ie88f3881c3ca210cf7950138b5f28659de14ed03