am 9fd0854d: Merge "Fix test" into jb-mr2-dev

* commit '9fd0854d2a875667b3662aff39d65831b5298cdf':
  Fix test