[automerger skipped] Stop using factory serial numbers in NetworkFactory. am: f486b23982 am: 0b9e88d6dc am: 4f6e318fea -s ours
am skip reason: Change-Id I102af09cb52b447e472398869d82556b5708cb82 with SHA-1 89a7c62849 is in history

Change-Id: I06d528e2ccde1a2dffff175dd737ec4d11f9c391