[automerger skipped] Reordered the params for network registration
am: ccd62f2295  -s ours

Change-Id: I82023b200f07f2e1fe60c0f94616078026cffda7