Merge "Revert "To read the Group UUID, the Caller must also have the US..."" into tm-dev