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

Change-Id: Ib86176ec36fe67605b9b6298921651ae99475982