[automerger] Revert "Refactor "spring" code into one method." am: 6a2a1a91a0

Change-Id: I158aa43199f611917b2a2f24a05c0431c8017699