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

Change-Id: Iad1e45761ebbc0a8ccd269734807bbae8ff36209