This is in preparation for adding more springs to the state transitions. Bug: 111698021 Change-Id: I32cd7894e940dae00895799280b244d68400d374