Merge "Change group id of sdk data directories" into tm-dev