Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread