am c6de977f: Merge "Fix a bug in AddToCodeCache"

* commit 'c6de977f6482014a9d01a880efe3eed8bd2007e6':
  Fix a bug in AddToCodeCache