Merge "Changed AccessPointPreference setTitle to use getTitle()"