Merge "Don't hang in restore if the transport reports failure" into ics-factoryrom