Merge changes from topic \\'debuggerd_client\\' am: abf88685e3
am: 88347e1430

Change-Id: I81a54d4f0c017090f8d9f31459181c537842ff7c