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

* commit '6345230095ac4ac7eb45c71caccd5a4b02942a8e':
  JWR66G
  JWR66F
  JWR66E