Merge "When we update slow we override the current state. Make sure to reset the state the operation finishes." into nyc-dev
am: f6d7473

* commit 'f6d74737de988527c2efba19e467388376f5f9ac':
  When we update slow we override the current state. Make sure to reset the state the operation finishes.

Change-Id: Ia237be201978ffcd2cb047163cd7c878ec13430b