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

Change-Id: I02ded963a8261c5e90349e0273f83fbfcc526f01