Merge "CwPerformanceLaunch checked in to avoid sideload" into cw-f-dev am: 8fbfd3e1 am: 954dfb65 am: 7fc6150b Change-Id: I1fc7053ab7b7ae278d17e448a9916b8b7e5280c0