Merge "docs: Fix typo" into nyc-dev am: 8d660eebad
am: 7843568a38

Change-Id: Ia40f0924550ad1a3a923d93c4d4dc60f6ec1416c