3956b20a97
Since we're python3 only, we don't need six anymore. Change-Id: I82c35f364315129a41dd5cbea64c0c5a50662026 (cherry picked from commit 4d511679e8f3ad2b0f7810ea568d5834adc64d8e)