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

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