am 6cd72bd0: Merge "Don\'t pay for filename/line number lookup unless you need to." into ics-mr1

* commit '6cd72bd0161459e21d496b927967bd0ca6fe0f94':
  Don't pay for filename/line number lookup unless you need to.