Refactor AtmosphereHandler to a field (#13514)

Change-Id: I0956e31acfec605418eff0313fbcf82c3c7d6579