Help: Do I need a transit visa?

I am transiting through China in October on Nepalese passport. My itinirary: Flight from LA lands in Shanghai followed by additional layover at Kunming before the flight out to Nepal. Total time in China is 22 hours(transit in Shanghai + flight time between Shanghai and Kunming + transit in Kunming). Do I need a transit G in this case? Appreciate the help.