Merge "Remove unused constants from NetdConstants.h"