Merge \\"docs: fix typo error in class name\\" into nyc-dev am: 35d61e4117
am: 9d7d33a407

Change-Id: Iab63b676e08c061b7f07bfa124eb30ec5f1fdc99