am f41ae393: am fc8ee3a1: Merge "Fix density tests." into jb-mr1-dev

* commit 'f41ae393c5c946bf1e9536ecdd88ab6d472dde97':
  Fix density tests.