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

Change-Id: I29fc2270df41e5c401d78820feb92dce4f015bba