Documentation tune-ups

Change-Id: Iac0ddd4948ab364e1905327978bf449b52294388
Merge "Documentation tune-ups"