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

Change-Id: I38e3cb135ef5829c129d8e255486819083bcd988