Cherrypick upgrade docs commit