Merge "Fix computation of pc."
am: 71fa8125b9

Change-Id: I2a600c1fbe47ff5e4efadc0ff961d174b64f29c3