Unused import.
Merge branch 'master' into remove-bytes_as_strings