Merge "Merge "Revert "CwPerformanceLaunch checked in to avoid sideload"" into cw-f-dev am: ef415103 am: d3b887c9" into nyc-mr2-dev-plus-aosp