Merge "Don't remove wifi preferences when updating AP to avoid GC." into nyc-mr1-dev am: 06609bec29
am: d08309e829
am: 442e87e0a3
Change-Id: I52de239834df02a55e6c3c586e989f27cbaca87f
This commit is contained in: