Merge "Revert "CwPerformanceLaunch checked in to avoid sideload" am: b98107c9 am: 5c356b9e" into nyc-mr2-dev-plus-aosp