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

Change-Id: I2288326d263722446600b985ecdcf4b4b97f3766