Merge changes Id91fabb4,I6d117032,I88fce1b2 into tm-dev

* changes:
  Address comment at ag/18491259 and ag/18486388
  Run comparison code if the data migration finished with fallback
  Persisting status int on the device if fallback happened