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

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