Update/fix docs

Change-Id: Ifa3cfc6fe38ea45e70b50683c36e7cbf3bb4ef82
Merge "Update/fix docs"