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

* commit '03a64463b79e6312124f1d772e16499de18ad564':
  Fix test