Merge "Revert^2 "Use frame info from CodeInfo."" am: 0b4a439f80
am: 4654af4af2

Change-Id: Id7bd8106b1bae73dea908286783b2a072a02e454