Merge "Merge "docs: Fix typo" into nyc-dev am: 8d660eebad am: 7843568a38" into nyc-mr1-dev-plus-aosp
am: 6ad34dc43a

Change-Id: Ia88c97f1c12f9f6d091a766e147eba0197b7c782