am: f9e04362 -s ours * commit 'f9e04362': Reduce memory usage in GVN Change-Id: Icc030f7aa17c498d40943b237e32c057742cd0e7