Re-order imports to make pylint happy

Change-Id: I4c54be3f13d13558d6beed36dcc6cfccf3a19f5f
5 files changed