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

* commit 'fd5b59feba63a695977169e4f3fee3133af97c1e':
  "JWR51"
  JWR50B