am a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit 'a6c77d92fcbc2a39758ab28c32b701025d637a7b':
  JZO54K
  JRO03X