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

Change-Id: I9c79eadbf827f9f8cb17c69e704c25e5225c2bc5