code review for patch 8 and other docstring improvements.

Change-Id: Ib78f0365745344552339e7ea87e4f491754a373b