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

* commit '1d3cb5f587107d63ece8ff3f3906ab3461f32d38':
  Fix build breakage after GVN change.