Merge "updater: Defer the creation of the new data writer." am: ddc81680e6
am: ae3e472a43

Change-Id: Ic1e698621b8f32e78bc24c00d85e4bb760f1d782