Merge "Merge "CwPerformanceLaunch checked in to avoid sideload" into cw-f-dev...
Merge "Merge "CwPerformanceLaunch checked in to avoid sideload" into cw-f-dev am: 8fbfd3e1 am: 24b1a863" into nyc-mr2-dev-plus-aosp
am: 9b58e0fc
Change-Id: I8367c5315db5b10a428afa2ee503fd5a34a7652d