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

Change-Id: I2031389cf3de22134af6ca48c0537e7ec3d150bc