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

Change-Id: I9845f4d907dcf2584f56b019683f7fea499ec889