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

* commit '90aa9d848485a9209e80b1beadecf8dd3ba3553c':
  JWR66Q
  "JSR85"
  JSR78D