Merge "Stop using netmask in the framework"