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

* commit 'ab9fd481634f7b32ad9d697fc6a57212c1fbf039':
  "JWR52"
  JWR51B