Add extra checks and timeouts to account migration am: e01ba4c819
am: 5b52ff6aa7

* commit '5b52ff6aa79c3e7e5e3c981358440006c0c626de':
  Add extra checks and timeouts to account migration