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

Change-Id: I9803c6c8dc78bfd2f86d7850368dfb9ad82ebbf6