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

* commit 'd8d0c17e22f42597497e8f9f5c134621e399e22a':
  "JSS11"
  "JWR66V"