Merge "Return local shard tree from FindPrimaryShard"