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

Change-Id: I62a2dee60f16c47be0614b9688e92a290e4f45c7