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

* commit 'd8ef19b0c8a57daea726ad93edbbe396b9e9f5d3':
  JWR66J
  JWR66I