Merge "Replace subnet mask calculation to Inet4AddressUtils" into sc-dev