Backports the following commits to 15.x: - Update docs to use async/await (#667)
(cherry picked from commit 50898d3fc5)
50898d3fc5