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

Change-Id: Id760c92877465c5f6e0a10d4110e0870a7b4473a