am df0e5961: am 78be3f3f: am c5b507e3: am 03a64463: am 430eeb70: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev

* commit 'df0e59615e31748c02406d18416e07807665173c':
  Fix test