Merge "Clean-ups in diamond_search_sad"