Merge "Fix to read Tethering APN data terminated by empty parameters correctly"