Merge changes from topic 'debuggerd_ambient' am: d765766bcb am: d7ebbf1d9b am: 59b687a244
am: ff9596ffcf

Change-Id: I59c221933f992107b2e436e9de14bac56c0928a2