Merge "Run GVN earlier." am: 740a50992e
am: ab9a9c6094

Change-Id: I7b62a376976539417e1be2df1be3e8f910cef45b