Merge "Merge "CwPerformanceLaunch checked in to avoid sideload" into cw-f-dev am: 8fbfd3e1 am: 954dfb65" into nyc-mr2-dev-plus-aosp