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

Change-Id: Ied303553db98450ed7607de99ffac2668a1d5d85