Revert "Revert "Merge branch 'import' of https://github.com/pipcet/jordan-android into dirty""

This reverts commit 83c97272738705abc7d6356f19fc97ab0eef36d8.
Revert "Merge branch 'import' of https://github.com/pipcet/jordan-android into dirty"

This reverts commit d31da56b57ee88ada663bda9a95b54addf63bb3b, reversing
changes made to cc05e93427bf85dc2907d71b62c793bb03157c73.