am 078f5bda: Merge "Fix broken test Bug #7162515" into jb-mr1-dev

* commit '078f5bdafd1987f7eed259d2bee80dea6a8ecae9':
  Fix broken test Bug #7162515