Merge "Fix AccessPointPreferenceTest and add updateIcon test."