am ab529f13: Reconcile with jb-mr1-release - do not merge

* commit 'ab529f13368a07e619f7aa2147164eeca91144db':
  JOP38