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

Change-Id: I0bd912fee4669fef44e8740d61546d2f2073d3a6