Do I qualify for the free night visa?

We're considering flying China Eastern LAX-PVG-KIX. The layover in Shanghai is only 3 hrs on the way to Osaka, but on the way back is only 1 hr 40 min. Does this qualify for the free night transit? And are the transit times realistic, especially the 1 hr 40 min? I really do not want to miss the connection flight. Thanks!