Doc fixes after review.

Change-Id: I90245894ec7949999e7d2ad5063d955930e1ba77