Merge "Add wifi only flag and test method name to cm tests"