complete SCM versioning-take2.

Change-Id: I19ab479bf3b64f5861b4341cfbf37f2effc675d0
Merge "complete SCM versioning-take2."