Merge changes from topic 'debuggerd_ambient' am: 279cb8b39a am: 124fe65738
am: 39ca948d97

Change-Id: I0d1acce6b444526ed2d4e46b2ac91cb8a7713d50