These particular imports are no longer needed in a Python 3-only world. Change-Id: I46e12135aa9759fe05c00e9e7159b352a2b1482f