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

* commit '151c3655cb63111b47cff4a297f738bab9c567a2':
  JOP38