Merge "Fix off by one reading build id."