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

Change-Id: I8ec5ee9f8be330a74383864ebcda24906caa32c0