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

Change-Id: Ieee21e5a860b153393058d837b0f25aa3a507ffa