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

Change-Id: I4df576fd0f070c4104ff83498eca20987c6a7b07