Merge pull request #388 from android/jakew/spans/2018-03-03

Span improvements.
tree: 13b0e7cec88098c33d8068a20e6fc9da6b5b56e9
  1. core/