Merge "Fix SDK docs after b9a8666eb5504f022343fef9087135b7d937ddf8."