Merge changes from topic 'debuggerd_fallback' am: 48a31877f0
am: 4048633404

Change-Id: I903d2de5a839f66ac8fd0f6621bff07da859f7a6