Merge "Don't remove wifi preferences when updating AP to avoid GC." into nyc-mr1-dev