Merge "Merge "Merge "Merge "Merge "Fix CTS wifi toggle test Related to bug: 31050764" into kitkat-cts-dev am: ab80abbf4d" into lollipop-cts-dev am: 584a989711" into lollipop-mr1-cts-dev am: 5f6b70f327" into marshmallow-cts-dev am: 456636459b" into nougat-cts-dev