Merge "Fix the flaky test MaxServerPrune_Binder" into qt-dev
am: 9206a01ca1

Change-Id: Ic2eb0c685248060e9ca3ac48b510666d40577c81