Merge "Ensure subdirectories of sdk data inherit group id of parent" into tm-dev