Merge "Fix bugs in BuildFrameFromPcOnly."