Travel is lax >pvg>hkg>pvg>lax do we still qualify

Our travel is the following
LAX to pvg connecting to hkg immediately after a 4 hour layover for a 2 day visit. We then travel back to pvg and plan to stay 4 days .would we qualify for the visa fee waiver if it's during our return leg thru pvg, before traveling back to LAX?