Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev