am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev

* commit 'be10a86620947bfee882c50ae725ceb10cbae98f':
  Reduce cost of span type checking