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

* commit '18daa1750ba31b510d07d0f65e8e8007ed90b902':
  DO NOT MERGE: better late than never: fix build id for JB MR1