Merge "WifiDiagnostics: Fix alert handling" into pi-dev
am: 877c3bc1d9

Change-Id: Idd87c69e332c1e03f09d6aa7b1a73d1bd05372dc