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

Change-Id: I1c421b8de7307291b5a276faaf1455915f81a85c