Merge "Update 6.3 (Put optional parameters at end of overloads) with a callout specifically mentioning the exception in 7.5 (Accept Executors to control callback dispatch) for placement of Executors.  Add back-reference." into main
diff --git a/api-guidelines/methods.md b/api-guidelines/methods.md
index 0a0b8be..ca4575a 100644
--- a/api-guidelines/methods.md
+++ b/api-guidelines/methods.md
@@ -144,6 +144,10 @@
 a developer could reasonably expected to write the body of a SAM class as a
 lambda, the SAM class parameter should be placed last.
 
+Note: The guideline on [use of Executors](#provide-executor) overrides this
+guideline, as it allows for an overload that omits an `Executor`, even though it
+is not the final argument in the parameter list.
+
 ### Methods with default parameters must be annotated with `@JvmOverloads` (Kotlin only) <a name="default-value-jvmoverloads"></a>
 
 Methods and constructors with default parameters must be annotated with
@@ -1343,7 +1347,8 @@
 developers about common default options. Also note that the callback argument is
 required to be last to enable idiomatic usage from Kotlin.
 
-As an exception to our usual guidelines about optional parameters, it is ok to
+As an exception to our usual
+[guidelines about optional parameters](#optional-params-last), it is ok to
 provide an overload omitting the `Executor` even though it is not the final
 argument in the parameter list. If the `Executor` is not provided, the callback
 should be invoked on the main thread using `Looper.getMainLooper()` and this