Merge "Remove the CodeOffset helper class." am: 3b562b18ba
am: e441068b02

Change-Id: I92549837a9fdce683f9cfe91eb3d23de07b7d52d