Merge "Revert "CwPerformanceLaunch checked in to avoid sideload"" into cw-f-dev am: ef415103 am: d3b887c9 am: a77215a4 Change-Id: I864809e7dce0683355013c34399d3b5ed494855c