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

Change-Id: I73551974dec779748023e7e61ce419ba3005a4ba