battery replacement, and analog stick replacement

I would like to know if anyone knows if the Nvidia Shield Portable uses 2 18650 batteries or not. Would like to know the mah rating and amps, weather they are flattop or not.

also Would like to know the part number for the analog stick board shown there on the breakdown to see if NVIDIA would allow shipping that to me.