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

Change-Id: Ia31867b74bd1d08e291030627db40de305ceb7b7