Merge "Revert "CwPerformanceLaunch checked in to avoid sideload"" into cw-f-dev am: ef415103 am: 985ffa07 am: f6ac4e65 Change-Id: I346a84a13bb0efea89162eb696235a7cc5992484