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

Change-Id: I6191f42a361b9915a73ad07f5eb2ab78f542bdfa