am f518b598: Reconcile with jb-mr2-release - do not merge

* commit 'f518b5982edc0fa8fb916f38e52ce54c56d6a11d':
  JWR01B
  JWR01
  JWQ87E
  JWQ87D