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

Change-Id: I7645505963506f395c74b125e3b3e103422d4821