Merge "Fix doc mistakes"

This commit is contained in:
Zuul 2018-05-30 01:14:19 +00:00 committed by Gerrit Code Review
commit 8d366a1e57