Some documentation updates

Change-Id: Ica5403bae4443dd2bc8a667d94894ecaaad41160
Merge "Some documentation updates"