Merge "fix docs" into nyc-dev
am: 23ca16865a

* commit '23ca16865ae63a482f8725f663231389a7984202':
  fix docs