Bug: 62866191 Bug: 63074860 Test: wifi unit tests Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9 (cherry picked from commit 56e46134)