Merge changes from topic 'debuggerd_ambient' am: d765766bcb
am: d7ebbf1d9b

Change-Id: I3f1ec16d480ad653242127f8d2680c4b05461f9f