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

* commit '2e6d4ae02a955d33a75c0642b8ffead20e11fd9a':
  Keep pointers to extension values.