Merge "Restore original default Wifi sleep policy (always)" into jb-mr1-dev