Extract the state changes from the ensure storage method

Instead of having the ensure storage (which ensures the
atom/s storage details exist) also change the state of
the flow have the prepare method which calls into ensure
storage do these state changes instead.

Change-Id: Ic7cd13ab360e68fc33e94c67a237adeef7040159
Merge "Extract the state changes from the ensure storage method"