Merge "Fix macro for maximum allowed HOGP devices" into m-wireless-dev