Merge "Rename setAccessUids to setAllowedUids" into tm-dev