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