Merge "init: add timers around sync() during shutdown" am: 39273df651
am: 573352ff05

Change-Id: Ie0584bcbc3d8a5a251945c30edf41735324dd431