Merge "Use the rel_pc instead of computing it." am: 24f4f7956e
am: 8607fde78a

Change-Id: I7b183e77eb9f4c359d90d3d61593b22ad9e3a3eb