A tiny optimalization

Change-Id: Ib2cb773ffe5cb579c2b46bd0e6a5a3f2c55d190d
Merge "A tiny optimalization" into cm-10.1
Revert "Patch Set 1/2: Add an "Automatically Connect" option for WiFi networks"

This commit breaks 3rd party apps like Tasker.  It is being reverted until a better solution can be found.

This reverts commit 19c7d4995a554bc26a17b55f481193c435d30560

Change-Id: Ie279aab8f52bd30dc21dbc70040fb3bd23721e33
Merge "Revert "Patch Set 1/2: Add an "Automatically Connect" option for WiFi networks"" into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1