Preparation for including docs in round-trip with OSS, Manual merge, review and merge docs internal-OSS