am 25dcb259: Merge "Let the map function compute the relative pc."

* commit '25dcb2594a21a565ef82faa66a79bcf595c3a780':
  Let the map function compute the relative pc.