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

Change-Id: I86db28ba40fbb73fe0b50f8e751740767d22300f