Merge "Change wifi sleep policy" into honeycomb