Merge "Avoid signed extension of chars for build ids."