Merge "Add AutoCancelTest back to framework tests"