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

Change-Id: I536d608050d5ca03d410ff0424d3bbcf0d06e3b6