Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread