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

Change-Id: I92ea4539584cc79926e178a1e2e5d36581fd1fce