Merge "Better javadoc and rename several methods in ApnSetting." into pi-dev