Merge "Follow-up I81663929: Use grunt git-build to ensure we get the hash"