am e4d787b2: am 80e455e3: Merge "Prevent possible memory leak in SpanSet"

* commit 'e4d787b277a4b9435688c7e6f380bfc367751f76':
  Prevent possible memory leak in SpanSet