Merge "Update owners for EdgeEffect"