Merge "Add logic to use sync vs async SO response" into elalto