Merge "[wpa_supplicant] Cumulative patch from commit e4eb009d9" into rvc-dev am: 1337a99542

Change-Id: Iaeb8d0f76c1fd1705299e2d7ba6385f02378f7d0