Merge changes from topic 'debuggerd_ambient'
am: d765766bcb

Change-Id: I94a6e3b6082f9e153a7272c6d75f36f78a8a314c