DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result
am: 02d802e71e  -s ours

Change-Id: If1a7766ec46207280183c7eb08e036e526a12a34