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

Change-Id: I7ac6128e347cd9e1ecf74ca9b60e6352d3876ca3