Reduce memory usage in GVN
am: 4283aa9fd0

* commit '4283aa9fd085d7d9a46e016cd68018d10135841f':
  Reduce memory usage in GVN

Change-Id: Ie766cbeb4da5521eb6a2cb0318407a40ec11183b