am f90eec00: Merge "Fix build breakage after GVN change."

* commit 'f90eec005997f98c1a9f874fbbf68414e5f9c766':
  Fix build breakage after GVN change.