Merge "[wpa_supplicant] cumilative patch from commit bb945b98f" into udc-dev