Merge "Fix flakiness in BasicCallTests" am: 2838dbdaa0
am: ebdc260d59

Change-Id: I21e684e229994ece2234436fe7d2e4802285a4fb