Merge changes from topic 'kill_debuggerd' am: cfb19e3ac8
am: fe6eb8761d

Change-Id: Ia02b6894b0a6d92fa7c6c9c3af6ba22fd1995930