Stop using factory serial numbers in NetworkFactory. am: f486b23982 am: 0b9e88d6dc

Change-Id: I2265a8ac2afbc4b920363cac79c8f5b7d72230d6