Merge "Fix off by one reading build id."
am: 82a93856be

Change-Id: I1c8d4c8510becc2e878c8580ad96d2bb535e4cab