Update some documentation

Change-Id: I6a75964d2048de451e9b01a08f87cfe1ebd842ba
Merge "Update some documentation"