Merge "Fix docs to be clearer and more maintainable" am: 7e62a930a1
am: eef56a4e6c

Change-Id: I82ac15bbebd70838ed3b0aa50bb4bd48a644fc7e