[automerger skipped] Merge "Fix off by one reading build id." into qt-dev
am: 4a6483923c -s ours
am skip reason: change_id I97f4a204842447a20c812f535a458155b937d5e1 with SHA1 1760b45709 is in history

Change-Id: Ia847f2fc55622f4a1f39b48ea809a3d572686e6c