Merge changes from topic 'kill_debuggerd'
am: 134a7193a0

Change-Id: Icb705df114dc073ef66507c59884e77ea1cf828b