@Jonathan
I’ve recently had the same problem with a smartphone with non-removable Li Ion cell. Yes it falls within UN3481 and PI967 section II and I fully discharged it and declared that on the parcel. You can ship in this way to most places, but, China has introduced new (as far as I can tell) restrictions. See this Royal mail website:- http://www.royalmail.com/china . Lithium batteries are included twice on the list of prohibited items. The phone is brand new, and has an intermittent problem with the touch screen, so I have to send it back, but, at the moment I can’t find out how.
Surely this is going to be a huge problem in the very near future.