am 803b73a2: am f9f837fa: am 6613ec44: am 403e22b9: am 751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev

* commit '803b73a29004d2f8bf0234c0619480f5e639b5d6':
  Don't redundantly call transport.finishRestore()