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: 954dfb65" into nyc-mr2-dev-plus-aosp
am: af4f68dd
Change-Id: I9148955b1d9cc8ace142eef3830ad4511c5200d0