Fixed imports so that they are consistent

    Cherry-picked from master branch and fixed conflicts