Merge "init: don't sync() before shutting down services" am: d54a4bf9a3

Change-Id: I8a6699ee125e03b672bf38e1bb2a41f63fdd2bea