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

Change-Id: I541fab7ad6203733e0452cb9b96f144be2fe8464