Merge "[wpa_supplicant] Cumulative patch from commit e4eb009d9" into rvc-dev am: 1337a99542 am: 2f71ce21b7 am: d6d2d5fd1d am: 0dc26fd188

Change-Id: Ia900763e37cd847d5bf8d0507cb0e7f315cd66e8