Merge \"Docs: Performance final changes\" into nyc-dev
am: 7e8d17d73e

Change-Id: I3ecd311bdd1374cfec29d95c303df70bfa868816