Fix up the imports on a recent change to follow coding spec

Essentially, we want to avoid doing:

    from module import f1, f2, f2

and instead doL

    import module

    module.f1()

This helps with reading the code and understanding where the functions
come from.

Change-Id: I1bc06441dc5595e8a0c84a5b5c3db5d88b68a4f2