Switch to using version.canonical_version_string

Change-Id: Id095c61325b0d64bc77b742abf72958aeb4cde4d
Merge "Switch to using version.canonical_version_string"