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

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