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

Change-Id: I6c5d6d21731a1280d170497e65d5d629cd8dead5