am 43c16197: Merge change 4228 into donut

Merge commit '43c16197b2a6da3a3125b4a4a9fa6b70f447043e'

* commit '43c16197b2a6da3a3125b4a4a9fa6b70f447043e':
  Nexus: Clean up supplicant events, protocol, and continue plumbing