Fix broken pep8-trunk job

Change-Id: I8e6c270c70fadedf811fd7a045e559a4986c5eec