Add git short sha1 to timestamp

Change-Id: I74ecc8928193e1d55b8e4130daed70bf5488fa79
Merge "Add git short sha1 to timestamp"