Merge "Don't bind netpolicy right away from batterystats"