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

Change-Id: If088c32d962011bc3ed09a10e776e595ba11382f