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

* commit '7017cfe124721cadd3315a0a5700c83545916673':
  "JSS15H"
  "JSS15G"
  JSS15F
  "JSS15E"
  "JSS15D"
  "JSS15C"