Merge "Reapply fix for the git version header"
am: c78fc4e3d2

Change-Id: I5e6a94e0581140468544d38b3a1918c78781a02d