Merge "Expand comment about using a merge api base"