Fixed docstrings to match api reorganization

Change-Id: I4e0642008c4d68c224a83a985ce14b67fbadafdd
Merge "Fixed docstrings to match api reorganization"