Merge "Make apex availability of net-utils-framework-common explicit" into main