Merge "Docs for gerrit 47419"