Doc cleanups

Change-Id: I82b10aaf6bf8e53ed522405501263843d381bb1e