am 6f1be449: Merge "Let the map function compute the relative pc." into mnc-dev

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