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