[automerger skipped] Merge "Reordered the params for network registration"
am: 38f7576297  -s ours

Change-Id: Ibbe9027176ff14eae912c794fb0724cdc32f4926