Updates and fixes to documentation.

Change-Id: Id5bf8393ba9b9ed1cc1715383ee8207d2b3cd62d
Merge "Updates and fixes to documentation."