Merge "userspace reboot: stop post-data services and wait for them to be killed" am: 4592237300 am: 0ee759cc4c am: f8c1857ab4
am: 437f9f9283

Change-Id: I9a4c663d7a0c171ab2bfc2d13c7adedc89cffa51