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

Change-Id: I6278782b9a4cae83e468bf2ebe7ed8f56f3a10cd