Merge "Merge "docs: Fix typo" into nyc-dev am: 8d660eebad am: e24079f5b2 am: b354b01acf am: 0f91a8a84e" into nyc-mr1-dev-plus-aosp