Merge "Fix to read Tethering APN data terminated by empty parameters correctly" am: 6d94f19b54
am: 7bcde7af33

Change-Id: Ic3acff8a400bca4fcd742c8100667172a0e5a7fe