Merge "Revert "Add odlparent relativepath relative to autorelease""