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

Change-Id: Iefd9ff5e72dd2e9d552de2ee952dfa3e8a45dd00