am 573a0267: Merge "Add more info to GetSFields DCHECK"

* commit '573a0267dfa69b8e7dd656504361b45d0f328e00':
  Add more info to GetSFields DCHECK