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

* commit 'fe9a455a24a863eaf96520b761ea284cc3cd15ee':
  JZO38