Merge changes Id4ffa9f9,I1bb5d05d

* changes:
  Replace MergeSets() with std::set::merge().
  Replace StringPiece with std::string_view.