Merge changes from topic 'debuggerd_ambient' am: 0784e51163
am: ce0722f344

Change-Id: I16e66ebc770f0dbe0bcfea088648ad61e1818dd3