Merge "Move PC-relative addressing bases to a better position."
am: b1aa617639

* commit 'b1aa617639c01c0dffaafd1641e0304ad179b6a2':
  Move PC-relative addressing bases to a better position.