Fix some docs warnings

Change-Id: I01d0f7f6105aebb0e3a1b0a422b872efb47da098
Merge "Fix some docs warnings"