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

* commit '5b61a282255b5273f5194db73f3c88550dc11a57':
  Prevent possible memory leak in SpanSet