Merge changes from topic 'debuggerd_ambient'
am: 279cb8b39a

Change-Id: I431dd9d950e8f802098835465ef7d018699f7b61