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