Merge changes from topics "caps_refactor", "multi-plmn", "nr_band", "v6mtu" am: d8c60800ae am: 6e3048d2f7

Change-Id: I084d1a2c54a66d7d8a950c416a54833058d5aa35