Merge "Modify config.xml for tethering APN information." into klp-dev