am b5c4bc38: (-s ours) am f7af90c9: am 3cf2a8e0: Merge "Fix a comment typo."

* commit 'b5c4bc38336aed56ab6a4ac6e71afebc411890f3':