Merge "Update probing in membarrier_test"