Merge "Fix typos."
tree: da9f256a1f848d722c4f9f059f039fc7171d4105
  1. api-guidelines/