Merge "Avoid signed extension of chars for build ids."
am: d451f39245

Change-Id: Ia9145e164bc4e959c93618cd130b7337186a6e01