Merge "Add null check for Wi-Fi command"
am: 43ee2ac140

Change-Id: Ideddbcd85dc15012f405138c358f3dd8c516eef5