Merge changes from topic 'debuggerd_fallback'
am: 48a31877f0

Change-Id: I7a0721fc9cdce17975b5160ad65e6c61e12fcf87