Merge "avoid assuming build number is a 32-bit integer" am: 30afdee987
am: 170aa1c923

Change-Id: Ia11eec1dc9c1b484f7f5cd67ff1792b5c3423a26