Merge "Add the new row APN_SET_ID and default NO_SET_SET" into pi-dev