Merge "BUG-1759: SET_NW_TOS action values"