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

* commit 'fc8ee3a102f88d5df6114b47b858cb7541d6e40e':
  Fix density tests.