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