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

* commit '4d9f13dd0fcefad9ce2e27f3b48bc0e4ba3fb9b1':
  "JSS09B"
  JWR66U