am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev

* commit 'c6fca7376b6f475a47622ed31fb5b5f6e57f01d0':
  Fix test