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

Change-Id: Ice3826e3a0c6008442d4aa289afd2c4e50f7ff4e