am f39998c2: am daf63839: Merge "Keep pointers to extension values."

* commit 'f39998c2c5754ec6e2ff5ddfa529a079093b41e9':
  Keep pointers to extension values.