am 34949064: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '349490646f72d63eb88fcb806a96248b4146d319':
  "JWR59"
  JWR58C
  JWR58B