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

Change-Id: I508eafe71073ad8b90cb16b8f42eb5ecb1605853