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

* commit '8870070d426f910cc223b3ea4f2f33a1c477014a':
  "JSR73"
  JWR66H