am b71b2905: Merge "DO NOT MERGE: Change build id to JB_MR2" into jb-mr2-dev

* commit 'b71b290587a1c64c89745fa730bcbb0c4d69f6cc':
  DO NOT MERGE: Change build id to JB_MR2