ML2: Pep8 fixes.

Change-Id: I911255e4cb07c322fad0fdced69bb734a452455e