Merge "Run GVN earlier."
am: 740a50992e

Change-Id: I3591eb6f87bc1a315bb8fe18239aa26fc7f3c08d