Merge "Remove unnecessary uses of odlparent properties"