Fix docstrings and PEP257

Change-Id: I3406bee8df5c244703f744b9dd83b953af983517
Merge "Fix docstrings and PEP257"