Merge "Use binary search to discover closest sync sample index, replace"