Merge "Handle the visibility of sdk sandbox uids" into tm-dev