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

Change-Id: Ib1d921e55cdc30612d8335999e71d836a968c298