[PEP8] changes

Change-Id: Id72f0267538d42e23b4db7ae1e3f9aea5bcf6611
[PEP8] changes

Change-Id: Ia93e76d36a40a85b3f443ed64a1c49023a6fa2d4
Merge "[PEP8] changes"
Merge "[PEP8] changes"