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

Change-Id: I14091fcf7be76b7383bbd1c8c1626d76c15220b1