Add pep8-compliant empty lines around imports, and between blocks Change-Id: Ic4bedf799f6a07e2d21a49b4ec1d5385d2882e45