Merge "Flesh out more API docs." into oc-dev am: 3a427c3bd9
am: 750d6d12f6

Change-Id: I3778fa0ead9c23909875f88f7debba1f56c867a0