Merge "CwPerformanceLaunch checked in to avoid sideload am: df5b5b6e am: 8ef7a9d3" into nyc-mr2-dev-plus-aosp am: 1dcb665e Change-Id: Ib49c028b320382c63159563332ffde0347007db9