Merge "Fix CTS wifi toggle test Related to bug: 31050764" into kitkat-cts-dev am: ab80abbf4d
am: 1b9d17534e

Change-Id: Ie46f94545488dea7ccc6541c8b2e6b960e68de0d