Merge "Merge \\"Docs: Performance final changes\\" into nyc-dev am: 7e8d17d73e am: 9e549cc14e" into nyc-mr1-dev-plus-aosp