Remove special chars(braces) in the distro string

Change-Id: I1769c18b04d6e8c3d73dcef0c3ba3c0f818cdfc2
Merge "Remove special chars(braces) in the distro string" into R2.0