Fix version string to use '+' instead of '-'

Change-Id: I8d520299f2f69aa56000ecc9696728affa204512