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

* commit '430eeb70a70bea7b79a7298b9f883aed645637c2':
  Fix test