Merge "Retain subscription IDs on restricted test networks"