Merge changes from topic 'debuggerd_ambient'
am: 0784e51163

Change-Id: I842b682377d92f1b140fe442073d7b97d5090208